From 38684d0a3563e61ace390097aecdcc701cae3df2 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 20 Jun 2008 13:34:17 +0000 Subject: [PATCH] fix some formatting and whitespace in the code merged from the GSEAL 2008-06-20 Michael Natterer * gtk/gtkaccelgroup.[ch]: fix some formatting and whitespace in the code merged from the GSEAL branch. svn path=/trunk/; revision=20638 --- ChangeLog | 5 +++++ gtk/gtkaccelgroup.c | 37 ++++++++++++++++++++----------------- gtk/gtkaccelgroup.h | 5 +++-- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 87ce01ceb0..2faee051f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-06-20 Michael Natterer + + * gtk/gtkaccelgroup.[ch]: fix some formatting and whitespace in + the code merged from the GSEAL branch. + 2008-06-20 Michael Natterer * gtk/gtkdialog.c (gtk_dialog_get_action_area): change return diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c index b277a4cc38..9c30d611e2 100644 --- a/gtk/gtkaccelgroup.c +++ b/gtk/gtkaccelgroup.c @@ -88,12 +88,13 @@ gtk_accel_group_class_init (GtkAccelGroupClass *class) "Is the accel group locked", FALSE, G_PARAM_READABLE)); + g_object_class_install_property (object_class, PROP_MODIFIER_MASK, g_param_spec_enum ("modifier-mask", "Modifier Mask", "Modifier Mask", - gdk_modifier_type_get_type (), + GDK_TYPE_MODIFIER_TYPE, 0, G_PARAM_READABLE)); @@ -179,17 +180,18 @@ gtk_accel_group_get_property (GObject *object, { GtkAccelGroup *accel_group = GTK_ACCEL_GROUP (object); - switch (param_id) { - case PROP_IS_LOCKED: - g_value_set_boolean (value, accel_group->lock_count > 0); - break; - case PROP_MODIFIER_MASK: - g_value_set_enum (value, accel_group->modifier_mask); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - }; + switch (param_id) + { + case PROP_IS_LOCKED: + g_value_set_boolean (value, accel_group->lock_count > 0); + break; + case PROP_MODIFIER_MASK: + g_value_set_enum (value, accel_group->modifier_mask); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); + break; + } } static void @@ -217,14 +219,14 @@ gtk_accel_group_new (void) /** * gtk_accel_group_get_is_locked: * @accel_group: a #GtkAccelGroup + * * @returns: %TRUE if there are 1 or more locks on the @accel_group, - * %FALSE otherwise. + * %FALSE otherwise. * * Locks are added and removed using gtk_accel_group_lock() and - * gtk_accel_group_unlock(). - * + * gtk_accel_group_unlock(). */ -gboolean +gboolean gtk_accel_group_get_is_locked (GtkAccelGroup *accel_group) { g_return_val_if_fail (GTK_IS_ACCEL_GROUP (accel_group), FALSE); @@ -235,8 +237,9 @@ gtk_accel_group_get_is_locked (GtkAccelGroup *accel_group) /** * gtk_accel_group_get_modifier_mask: * @accel_group: a #GtkAccelGroup + * * @returns: #GdkModifierType representing the mask for this - * @accel_group. For example, #GDK_CONTROL_MASK, #GDK_SHIFT_MASK, etc. + * @accel_group. For example, #GDK_CONTROL_MASK, #GDK_SHIFT_MASK, etc. */ GdkModifierType gtk_accel_group_get_modifier_mask (GtkAccelGroup *accel_group) diff --git a/gtk/gtkaccelgroup.h b/gtk/gtkaccelgroup.h index 48815d0374..80780dba5a 100644 --- a/gtk/gtkaccelgroup.h +++ b/gtk/gtkaccelgroup.h @@ -73,10 +73,11 @@ typedef gboolean (*GtkAccelGroupFindFunc) (GtkAccelKey *key, struct _GtkAccelGroup { GObject parent; - guint GSEAL (lock_count); + + guint GSEAL (lock_count); GdkModifierType GSEAL (modifier_mask); GSList *GSEAL (acceleratables); - guint GSEAL (n_accels); + guint GSEAL (n_accels); GtkAccelGroupEntry *GSEAL (priv_accels); }; -- 2.30.2